HOW TO RESOLVE CONFLICTS